Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: e35563534d
am: 872a4de500  -s ours

Change-Id: I386c1b5bddb695727c8aab887deaa3fa24a33f7d
tree: fe963cba7f984d39c90d94258494e9b9fedc1298
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml