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

Change-Id: I244dccec37fc00e5f1a3473de332dfeb0e4d8758