am 24559290: Keep the emma classes if emma is enabled.

* commit '245592908c5be4c841ce7a93cf0c8e9e6a8e5965':
  Keep the emma classes if emma is enabled.