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

This reverts commit cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
73 files changed