Revert "taken care of by device/qcom/common"

This reverts commit 3e24a30363903aa1196ba90cc31a99063e7c1f30.