bionic: Add workarounds for current compilers