Merge "jni: use SurfaceComposerClient in sampling"