Merge "Move to new isolation test runner." am: 4755a06956
am: 6d7bae1ade

Change-Id: I5f67f5bf9b5d2e92201a19ab06dca38c05c7a863