Merge "Revert "Emulator: add overlay for goldfish device""
am: 225ee008e7

Change-Id: Ide6107baf020ebbcac926fb28933736333c1f56a