Merge "Support genrules with multiple tools" am: 5222c47773 am: 1d1e63b82e
am: 8fcd3c6dee

Change-Id: Id054d14ebb3e7e6a1e16ccddc1861443cbbc89cf