Merge changes from topic "reorganize_intent" into pi-car-dev
am: a224ae40dd

Change-Id: If628a878893be5e1267c5031a63c61c1e70b6b0f
tree: 675e04c92f87cf1849f2d25577433ba8e69a0c76
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg