Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb