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

Change-Id: I439fa4aa9f2fb22f372a6a76ab07676c0c51e429