Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I2bcb72e0c4688bdc8c690c05ed05f9ff7a649d13
(cherry picked from commit 83e882836bea5ae11f21dd619dd9ae3a2e0c12e3)
2 files changed