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

This reverts commit fbd5f5fdce07a6d77dd2c3309c7272bf33414396.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
195 files changed