Merge 1e18f11cd4b53503f4c22ec4bab874383edadec8 on remote branch

Change-Id: I4b7cf8c1536d600bf5164fa54c5cd4270cfd0925
tree: dc289b1bfbebddd2ec5969e9e8a899f3e23b1c2e
  1. libs/
  2. Android.bp
  3. LICENSE
  4. METADATA
  5. MODULE_LICENSE_APACHE2