am 43519313: Make a library version of the custom emma library.

Merge commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e' into eclair-plus-aosp

* commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e':
  Make a library version of the custom emma library.