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

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