Merge "Support fastboot variable 'variant'."
am: 007e52efe0

Change-Id: I4279b0da700b1595e67b2ed95a66eca9e8018e26