Forgotten files
android-gui: Runs instrumentation in a background thread
Types renamed back