Merge changes Iced6c414,Ie82d51ec am: a239543061
am: 055b81567d

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