am e6aac48c: Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: 80e3ce8 automerge: bd79a42

* commit 'e6aac48c7da09c20abcafba8ab003848aa8448bc':
  Move to the new LayoutlibCallback.