Merge "Changed CTS runner to work with emulator" into honeycomb-mr1