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

Change-Id: I7fdc8e5a947b9403cf35e4d924bd0ae3fab70626