Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES."
am: 7a1ea4e25a

Change-Id: I52fc83bcd114c287529ac680d6fad424424fa938