Upgrade to asm 5.0.4

(cherry picked from commit cbc5ebf4a923eae1fecc325caa79d57f8c39b9f5)

Change-Id: Ia0f06a2e3d9c1df51803a4053ca3433bf3dcb848
7 files changed