Update package names to work with the proto3 compiler
am: 8b660aad9d

Change-Id: I7b572d75fc9f788733622701e0eb641161715257