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

Change-Id: Id2281a355d7f82cbec61bc8eee4f241ec9daaae6