Merge "Refactor GLES20Canvas/HardwareRenderer JNI layers"