Merge "Update runner to AndroidJUnittest"