Merge "adb: C++ify local_build_list and remote_build_list." am: 19d9454ee3
am: 9315403fd7

* commit '9315403fd741bb325ad6d6a073a01af15fba2720':
  adb: C++ify local_build_list and remote_build_list.