Merge "Convert Android.mk file to Android.bp"
am: 747cd94568

Change-Id: I3eebc88add2e71570e1722dbf9c3aba9cf6bf1fe
tree: d1483cd203b3c2e9c0b5484ddf4530706921fcd6
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. proguard.flags