Some final AOSP fixes