[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours
am: 8a382eda66 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: Iac7825da7163c0f2d0aebf808811922aeb0a2a21