Merge "adb/base: minor compiler portability improvements"