am d9d37cfe: am 30d15e54: Merge "Allow bionic-unit-tests-glibc to be built again."

* commit 'd9d37cfe218c83c99aa77e6f057b737e5ddc2061':
  Allow bionic-unit-tests-glibc to be built again.