Merge in CyanogenMod's Bionic

Change-Id: I3608e9b506b33f982718d056b6a9ad58d425b56a