Merge "Upgrade layoutlib generation code to use ASM 4.0"