Merge "serial: msm_geni_serial: Modify console iterations and hs uart ioctls" into msm-4.9