am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

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