am e4d729fd: am 01288cda: Merge "Update aosp/master compiler-rt for rebase to r222486."

* commit 'e4d729fd8679b75c61900419c7501d7347c5ed48':
  Update aosp/master compiler-rt for rebase to r222486.