am 98b3def2: Merge change I6261ab54 into eclair
am 98b3def2: Merge change I6261ab54 into eclair

Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-plus-aosp

* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base