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

Change-Id: I6120faf2e382813aa608ae419019bcfef68f1ba8