DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Ifd9204bd626ad86bddd96341016849ef31b40979
tree: 4fd31ff1308c1d6bbb30819b7821f73e4c02a4f1
  1. src/
  2. Android.mk