Upgrade to ASM 5 and diamond operators. Also minor fixes here and there. Bug: 26442940 (cherry picked from commit 23e47f5621) Change-Id: I770d80626ef7a7b8cba82ce2c5fbc54c8874bc6b
23e47f5621
6c1af7ea
8652bce1
c71f2648
60dd5d59