New Bionic stuff from AOSP Master Branch