Merge "Allow both RENDER and TEXTURE flags when creating native client buffers."
am: 2a3edda489

Change-Id: Ie071cbfb7d1d3f4c77f488e0f38bb4aa346072e0