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

Change-Id: I1e9375c99a5955d0318ae159b43e0a1899835e5d