Stuff for AOSP