Merge "Remove the auto-generated asm_support_gen.h"
am: d8ee1f5a8b

Change-Id: I24d3371a23a80febe577c04d61abe26a62d6b524