When serialId and avdName are both in arquillian.xml container configuration, try to firstly connect to physical device (according to serialId), when this fails, try to connect to avdName.

Right now when serialId is used in connection with avdName and there is a failure to connect to physical device via serialId, the execution is aborted.

This is not very comfortable from test execution point of view.