Merge "Pass userdebug/eng variant to Soong"