Merge "Use explicit .c_str() for hidl_string" into oc-dev am: 0005f132ce
am: 0730b35b18

Change-Id: Ibc0f8650ddde7d0e555a5aef48cf1b3e2c76324e