Update package names to work with the proto3 compiler am: 7bcf8af9df
am: 7756aa6aaf  -s ours

Change-Id: Iba0910764c7259a5f1cb4d7b776c0e4ab7dc44cf