Merge "Support fastboot variable 'variant'."