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

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