Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev