Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
am: 3db5d42f90

Change-Id: Ia944e535f7329c32bf34770fb0d99019cc1091f9