Merge "Support genrules with multiple tools"
am: d834009ee1

Change-Id: I8b17f5d61fc8ddc1ecccd821a596d3db45230c8e