Revert "Compile fixes after updating bionic to AOSP master."

This reverts commit 6c0ea1c168bce49f44a820b1e083cda0b5947538.

No longer using bionic master.