Merge "adb/base: minor compiler portability improvements"
am: 892f0e9300

* commit '892f0e93007dc912f18a09fd281c73adf762277a':
  adb/base: minor compiler portability improvements