bionic: Fork for aliasing/C++11 fixes.