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

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