Merge "Add adb shell command to default AIDL"