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

* commit '94aa427bc0c2893738e8d12f041f68490515517f':
  Keep the emma classes if emma is enabled.