Merge changes Iced6c414,Ie82d51ec

* changes:
  adb: make local_build_list match remote_build_list.
  adb: C++ify more of the push/pull functions.