Merge "Use final release of ASM 6.0"
am: d5d697b023

Change-Id: I94524349eaa38c020d932f301fe36f99952862bc