Merge "Support genrules with multiple tools"
am: 5222c47773

Change-Id: I2953299775fa7fbc5149ebfcc271d2d2b3cf06ff