Merge "Revert "Emulator: add overlay for goldfish device""