Merge changes Iced6c414,Ie82d51ec
am: a239543061

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