Merge "Update compiler-rt aosp/master for 3.5 (r209699) rebase."