Merge "Use explicit .c_str() for hidl_string" into oc-dev