Merge "hal: Add 8996 variant target specific changes"