Merge "Fix build following adb change."