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

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