Support MSAA4 and (non-ES) OpenGL in Android SampleApp

platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java

Index: platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java
diff --git a/platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java b/platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java
index 1479c9239659832120105eb7081f2535c0f79c11..a23b440106fa76a778c62ddd4351c889a1a09799 100644
--- a/platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java
+++ b/platform_tools/android/app/src/com/skia/SkiaSampleRenderer.java
@@ -36,7 +36,7 @@ public class SkiaSampleRenderer implements GLSurfaceView.Renderer {
     public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         gl.glClearStencil(0);
         gl.glClear(GL10.GL_STENCIL_BUFFER_BIT);
-        init((SkiaSampleActivity)mSampleView.getContext());
+        init((SkiaSampleActivity)mSampleView.getContext(), mSampleView.getMSAASampleCount());
     }
 
     // Called by JNI
@@ -71,7 +71,12 @@ public class SkiaSampleRenderer implements GLSurfaceView.Renderer {
         mSampleView.requestRender();
     }
 
-    native void init(SkiaSampleActivity activity);
+    // Called by JNI
+    private int getMSAASampleCount() {
+        return mSampleView.getMSAASampleCount();
+    }
+
+    native void init(SkiaSampleActivity activity, int msaaSampleCount);
     native void term();
     native void draw();
     native void updateSize(int w, int h);