Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7 am: c36175d754
am: 6cfafd4c7b

Change-Id: Ia8e8b2b45c55879b212ca2a7dbf8b5b6dbfa0b5b