Merge "Update asm version in layoutlib following Change I2a6396e7"