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

Change-Id: I89269150d7527cfefc1774973dc83c1aa2a36e25