P PPR1.171228.001 merge 8f98b58cfa96ce02bdb3bedd0f76cbaa7e0812e9 - clean

Change-Id: I96f1fa817e813c06af34f11ae27cbeddca62bd78
tree: d3062d6eae7bd572032afb5c484e494ca13e290a
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle