Fix C++11 violations

The C++11 standard requires a space between literals and identifiers
Merge "Fix C++11 violations"
Merge branch 'master' of https://android.googlesource.com/platform/system/netd into aosp-staging