Revert "Remove unused emulator variable"
am: be416b3155

Change-Id: I25b7ef46afa623f4320399acce0ba0a007df9311