Merge "Make am instrument capture logcat during test run, and return it to the host." into qt-dev