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

Change-Id: Id52eaddc657447349babd846de41a86e71393896