Merge "DO NOT MERGE: Revert "Update package names to work with the proto3...
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: 72eca0ce
am: 06999039 -s ours
Change-Id: If662f59aacc9389e06c41772cb08afa759d21e09