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

Change-Id: Ia7693c0bf6c730766100bb670a61d9bfda3c1345
tree: 8dd55317d69711c7aad2632948ca041d76007d13
  1. cpp/
  2. java/
  3. proto/
  4. Android.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE