am 758de404: Remove emma from test build to save space.

Merge commit '758de4045b2cb760c13e74758e7298a415964ee0' into eclair

* commit '758de4045b2cb760c13e74758e7298a415964ee0':
  Remove emma from test build to save space.