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

Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00