Merge "Revert "Push OverlayDeviceTests onto /system""