Merge "Implicit const char* cast removed, operator<< added to hidl_string." into oc-dev