adding unbundled emma library.

Change-Id: Ieaa8d82b535cfc5a1f808255ac5f8eab034686a7
resolved conflicts for merge of 05f1ab8c to master

Change-Id: I2190d297463260ea39d9d427fdac81e5933c1e50
am 77b9074f: Backport from master.

* commit '77b9074f3d835682d66fe18e0768639745c34239':
  Backport from master.
am 47e0cef8: am 77b9074f: Backport from master.

* commit '47e0cef87666634660eef34273875ebd54654862':
  Backport from master.
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1