Merge "adb: avoid compilation errors for unused results"