Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: b50445d94e

Change-Id: Ibba03d9e2462ed5b7566288daf806df062de2740
tree: cc9e5433ecb65a9beaf1d1f02d435ddb0d784ad0
  1. BUILD.gn
  2. DEPS
  3. proguard.flags
  4. src/