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

* commit 'ef4e7891177322d128897f1376d9077eeba19436':
  Update compiler-rt aosp/master for 3.5 (r209699) rebase.