DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 24d8553316  -s ours

Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f