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

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