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

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