Use PRODUCT_PACKAGE_OVERLAYS to override conflicting resources from common

Change-Id: I1d74fa3a5090ea041bdc7f3da2e4de81d72f9606
Reduce the overlay

Change-Id: Ifc570cc75a057afaae5d35f8809465d8f281e6b2