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

* commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af':
  Fix build following adb change.