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

Change-Id: Ic05a126644c2aaae63586210ee20173ad34894b9