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

Change-Id: I220457527b29fce9d6758cc54e36168d873ebc17