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

Change-Id: Ib3524a0f7e8634164ab77a10873f0e3afb4e47f1