Merge "Build proto_metadata_plugin, needed for proto cross-referencing" am: 42f7dbcbd1 am: c117e1745b
am: 3a6a565cc0

Change-Id: If360941b5ad8ce6b6c621a476fc8dadd1139c304