Update package names to work with the proto3 compiler
am: fbd5f5fdce

Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6