Merge "Move overlay location from vendor/overlay to system/product/overlay or product/overlay"