qcom-common: clean up

Change-Id: I30dff894a85e425c8e444c5ccde3c2081f222dc4