Merge "tools: Fix generate-asm-support script"
am: facda394dc

Change-Id: I4575b6676a866c42357711cec4a8bc6731923eb2