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

Change-Id: I72c9ebde8b45df2e1fc9a3d303c0ab6547c6834b