Merge changes I94640c0e,I407ed724 into msm-3.0

* changes:
  msm: usb_bam: choose dynamically between usb and hsic bam
  msm: board-9615: compile hsic bam info together with usb bam