am 52abbced: Merge "Fix SurfaceView in LayoutLib." into lmp-preview-dev

* commit '52abbced58ace68f8a91c4d092061d115af3b268':
  Fix SurfaceView in LayoutLib.