Clean up some bionic compatibility cruft.

Brings us closer to matching upstream.

Change-Id: Ic5c8449aae88566ecc5382a8d5d27f5095515b82
4 files changed