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

Change-Id: Icb2e639a96c3f1ba5c25be2e89dd0fac66623cd1
tree: 05a337d5fcea8f36a487f08593ab8442882282b8
  1. service-t/
  2. tests/
  3. Android.mk