Merge "adb/base: minor compiler portability improvements" am: 0e20f1184a am: 8163cbc535
am: 3396ad2c16

* commit '3396ad2c16037c0fda6273708a750eb6a15e2038':
  adb/base: minor compiler portability improvements