Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: bb52d0b3e4
am: 9b17807edc  -s ours

Change-Id: I6c1235b1cb9d988288994fa4ee34e44f7f9ddb44