am 7aba9ef3: am 492e8f72: am 4482091b: Merge "Consistently use #if defined(__BIONIC__) in tests."

* commit '7aba9ef3d00201d4410c5db0bf0853df24b94243':
  Consistently use #if defined(__BIONIC__) in tests.