Merge "Cleanup: use shared apex_key (wifi HAL APEX)" into main