am 7a415131: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/build into lmp-dev-plus-aosp

* commit '7a415131cfa9f44a0a07f5e411dc61d2982baa3a':
  Strip my_clang on assignment.
  Remove HAVE_GETTID.