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

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