am 9285a86b: Change emma to be optional build target.

Merge commit '9285a86b311cdfe573e1326590ffd2ca90200b4b' into eclair

* commit '9285a86b311cdfe573e1326590ffd2ca90200b4b':
  Change emma to be optional build target.