Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 264350ea3b
am: 4c1ab806d9

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