Merge "Update support for BitcodeWrapper using BitcodeWrapperer."