remove a AOSP commit regarding config