Merge "TextureView: clean up displaylists" into nyc-mr1-dev am: c0e2e0ad62 am: b6ef43e3df
am: 502a788007

Change-Id: Idc45ef565fd405c07f3c0174ea103c2c5cc58790