am b438c54d: am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"

* commit 'b438c54d02b722a93a72ff6e834ab78053ca3add':
  bionic: Fix TINY_ANDROID build