Merge "mdm9640: Append "rootwait" to kernel commandline in case of emmc"