Merge "Update bionic headers to c816e9f."