Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 667e8efae3
am: 16fcf590d9

Change-Id: Ia98ac9a2700fc76507877395f5cf9489402fd69e
tree: 321c6dfa7cca8429a1cdd044b720b1ba990a55d0
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle