DO NOT MERGE - Skip pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I2411b522e1367a8bc22778c719c8af7def0f90c0
tree: 9dd6204ca41a9a19cc481c9fbfd6f5c4b2d3435f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg