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

Change-Id: I9809781f2e88dfae52d56831b3bbb860777531b6