Merge "Add ADB command to wait for system server crash"