Merge "Take advantage of the new testFile argument in AndroidJunitRunner"