DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: e69f086d72
am: 84cad11e5d  -s ours

Change-Id: I11fc4ec250cad41599c9a96256eb639f11a6bfe9
tree: 33a3377a4caf520682687734541ee48206631db4
  1. Android.mk
  2. MODULE_LICENSE_APACHE2
  3. NOTICE
  4. cpp/
  5. java/
  6. proto/