Merge "AdbDebuggingManager: simplify JNI, add missing error checks." into main