Moved additional conditions into the device individual libraries and added emulator support (e.g. when avdName is given).