DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

This reverts commit e2ff6b31335ae0a1c4c82a25acc410b59aaaa764.

Change-Id: I3aaf0b7331697fb318afbc1e99e904ea0441e3b8
1 file changed