Update for AOSPA
Remove QCOM hardware dependencies