Merge "bionic: Fix TINY_ANDROID build"