Merge "Run fastboot oem unlock before flashing"