Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp * commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a': egl: temporarily also include eglTerminate->eglInitialize hack for 8k
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp * commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a': egl: temporarily also include eglTerminate->eglInitialize hack for 8k