Merge "Move "fastboot oem" to std::string."
am: 54182110ae

Change-Id: I82a7eb3ab983989a3fbd9829abd28e866c816846