Merge "Fix problems with NDK Sampler implementation."