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

* commit 'a4b8819e165988adf5d5eb5b4a41b77ccc6bf522':
  Move adb to C++.