patches for AOSP