misc changes to aosp core