Kill some AOSP ways