remove diffs in qcom-common

Change-Id: I5ddf0ab7e2aa6d5cc7ff236bf2aa0bcaea33f25e