Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES."