Merge changes I3d34bc47,Ia4a902d7 into msm-3.0

* changes:
  ASoC: msm: Add the kcontrol support different I2S audio format
  ASoC: msm: qdsp6: Add new AFE API supported by q6