Revert^2 "Remove unused emulator variable"

This reverts commit be416b3155a907d0c3855007795f627a4959e8cc.

Test: Compare output using --dry-run with arguments from buildbots
Change-Id: Idf714390c0dab598abca523b9f15a5773448bf28
1 file changed