DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 68938b7b46

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