Compile fixes after updating bionic to AOSP master.