Update for CAF display & media HAL variants