Update package names to work with the proto3 compiler
am: 7bcf8af9df

Change-Id: I06b3c6f3fb507ff927398b9ceda6ee5e88ca4193