Merge "adb: clean up 0 --> NULL for pointers"