Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread