DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: e69f086d72
am: 84cad11e5d  -s ours

Change-Id: I11fc4ec250cad41599c9a96256eb639f11a6bfe9