Merge "ssd/8960: Enabling ssd for fastboot using TZ"