Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7
am: 895b695ab0

Change-Id: I158aeb4a8327454a067310c7ba51c8487ada5c8d