Merge "Make android.hardware.thermal HAL optional"