Merge "Allow both RENDER and TEXTURE flags when creating native client buffers." am: 2a3edda489 am: 06f85bcf96 am: f66aa3f950
am: 79153902a8

Change-Id: Ifa6a6d6e8fdfd31203683523717d36d2c1507b86