bring qcom-common up to speed with CM (this time for reals)

Change-Id: I982eb5e31013c3f84a014ef416e594d1dfabc929