Merge "Fix 116-nodex2oat to use arguments in custom run script"