AOSP Bionic

Change-Id: I2c85ceb45f36aa4c05a22199cf1aa519b0e5bba4
Signed-off-by: Evan Anderson <evan1124@gmail.com>