Merge changes Ia318c933,I4bb7316e into msm-3.0

* changes:
  msm: audio: qdsp6v2 Fix error handling in memory registration
  msm: dsps: Fix include path for timer.h