Update package names to work with the proto3 compiler Bug: b/28974522 Change-Id: Ib442b050bafb4769cf9ce6998e7a4f9708ba3625