am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

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