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

Change-Id: I5e3cb0439fe609fb7df4d56ce5860b8020734bb1