PATCH: AOSP: Add QCOM extras to headers