am ba384982: am 63e91b36: am e57487be: am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit 'ba38498247f7c59cd4891282f6f5e0a862179ac1':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]