Merge "std::string from const hidl_string test" am: dd92847469
am: d23de8bbf9

Change-Id: I1baf6000c11fd1d5fa185e3cd0e383539dcc3b90