Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1