Merge dfcaabb6798f6d6294f08d22a5f09e94787a8a3e on remote branch

Change-Id: I7290aeceb1cbee08632e45deeeedce4e429133b0
tree: f50b839a5a7f7e72793edf3c9b2fe8663c896ce8
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties