Move emulator check & save system properties access

  Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
1 file changed