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

* commit '4482091b1d1611aa395931656b94bfd8ffd583bf':
  Consistently use #if defined(__BIONIC__) in tests.