am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change."

* commit '9cd94f87283159d80a51e1fce6ff68c97158b7ae':
  Fix build following adb change.