Merge "Use bcinfo::writeAndroidBitcodeWrapper()."