Remove parts that AOSP doesn't have