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

Change-Id: I8995ccc6b802e8cc9440f3030308c88de63d7496