am fa4eb085: am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev

* commit 'fa4eb085c3f01c0b659c37be585c13f0a9a3b360':
  Prevent TextureView from ever setting a null layer paint Bug #8760436