Merge "adb: rename \'flag\' to something less meaningless." am: ff2e26b239
am: a4be88c914

* commit 'a4be88c9140dfb913cdb396b5ad6b36502bc82cc':
  adb: rename 'flag' to something less meaningless.