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

Change-Id: I9464b0c2cbf122a20e04e959732a177f83a3d603