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

Change-Id: Ia7693c0bf6c730766100bb670a61d9bfda3c1345