Merge "Convert Android.mk file to Android.bp."
am: 4a5064b387

Change-Id: I0ebc67a904b9e6a3f1d65ffa639427f67166e660
tree: 5d42479cb4954878ee8a9e52d1a2a1ef92d63f36
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. proguard.flags