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

* commit '8163cbc535566e189aa704b21ce38d13b84efee2':
  adb/base: minor compiler portability improvements