am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

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