am 3f411357: am 5f2ccb0e: Merge "Move adb to C++."

* commit '3f4113571f89dc52b06314e8126ba5e252e9caaf':
  Move adb to C++.