Merge "Add all the internal protos to the java protobuf lib"
am: 3146aa7630

Change-Id: I7e1dc5a7af2c0f3c2f856fdab5a23fd548d1b5b6