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

Change-Id: I32e0144d7a0d6bcb1f346516cd799083d602faf5