Merge "origen/gralloc_ump: gcc 4.7 compile fixes" into linaro_android_4.0.3