Merge "Remove reference to LOCAL_PACKAGE_OVERRIDES."
am: 2d6b39e6cc

Change-Id: Iee55c2d13422948e196411121f305217ffa76b36