Revert "remove for now and use aosp's qcom's"

This reverts commit f9b24b798c986bf542a399d0457092cec348ad6d.