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

This reverts commit 6c1cd9425ab95c0ccde692887c7d0a756e7c4be7.