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

This reverts commit 318e0507b41d4ba2985ca058b8b7f6c98e0b8be9.

Change-Id: I43770c4786a2e9a2146646536aeeba3d1e20a23c
2 files changed