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