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

Change-Id: I526f576e2d13f38bb4ff3686c3d0a3f74fbc6584