Merge "Use final release of ASM 6.0" am: d5d697b023 am: a74b04cd70 am: baa428031a
am: 710fac6ab7

Change-Id: Ic726773fd17365d4821b63bcfc6d3d36330122a1