Reverted all the recent patches for aosp support