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

* commit '1db615b4ae469c9f33dc1d88b24924ca8efc10ef':
  bionic: Fix TINY_ANDROID build