Merge "Revert "Remove device/google/atv/overlay""