am 0ebc96e5: Merge changes from topic \'rebase-r239765\'

* commit '0ebc96e5d4336aa64f2ccb7bca4e950a824f494d':
  Fix tsan test builds and support SKIP_LLVM_TESTS.
  Update aosp/master compiler-rt for rebase to r239765