Merge changes I412c24aa,I28a8bbf0

* changes:
  mcomp: Remove an obsolete undef.
  mcomp: Remove an obsolete comment.