Merge "Make bitcode wrapper info available to MetadataExtractor." am: b2c126c9a2
am: a08c410586

Change-Id: Ic14e1c70e7b51a8f74c1e6cbfa062b97edd1b13e