Merge "hal: QCV changes for remaining HAL compile time feature flags"