Merge "Revert to new Codec2 HAL"