Merge "SurfaceControl: Fix captureLayers JNI" into qt-dev
am: 242f2c93fa

Change-Id: Icf85e3758637b17fcc1de1875bdf0b9ca5306072