Merge "Revert "bionic_libc_platform_headers is only available when buil...""