Merge "adb: rename 'flag' to something less meaningless."