Merge "Add LOCAL_OVERRIDES_MODULES"