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

Change-Id: Ie567c820645d7be77af2252404b4a2cf707030ac