Merge pull request #2 from pcarenza/jb-mr1

Fix up qcom caf makes (credit CM)
Merge branch 'jb-mr1' into HEAD