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

* commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6':
  Fix build following adb change.