Merge "Use explicit .c_str() for hidl_string" into oc-dev am: f059ae420d
am: 0070a334b0

Change-Id: I13e2e0d1ad1fd596bb5ebf6694816b41332840d8