Merge "Add missing adbOptions in runhat."