Merge stage-aosp-master into pi-dev-plus-aosp
am: 34e4fc653b

Change-Id: I2900b4f685490787d30d2c861942c2ab992933a7
tree: 77b44f573be30ad71558da74fe9ce7a5de9b53c7
  1. Android.bp
  2. OWNERS
  3. build.gradle
  4. java/
  5. tests/