Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES." am: 983e7547c2 am: e169824c17
am: de8eec6343

Change-Id: Iea93d5e5391eb9edbddc3ff442d324e327f6c003