Update package names to work with the proto3 compiler
am: cbd3f0c59a  -s ours

Change-Id: I8c957a9ad00cb393dbaaa05bec9730cc3a84a94e