Merge "Pass userdebug/eng variant to Soong"
am: 19f24492db

Change-Id: Ic13d60a9bf2c036f3d1babcecda6c5b50c5e9a69