Revert "bionic: Add workarounds for current compilers"

This reverts commit f58df9352f5ddd3a183aa23ffe15cc1934af6bc0.