Merge "add a new option to flash userdata.img from device image zip"