Merge "overlay: use DEVICE_PACKAGE_OVERLAYS" into cm-11.0