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

* commit '492e8f72505f4c14df3f37ed00bd6b62ce3893a2':
  Consistently use #if defined(__BIONIC__) in tests.