Merge "EGLAttrib requires special handling in JNI" into qt-dev am: 83a199bb91
am: 007a9139b0

Change-Id: Id3db006fdb0efaf51c6538a1f0c0a1d3f1220b9e