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

Change-Id: I68aefe87367ee171a2f58f39fd676ec6a6541153