Merge "snowball: Set TARGET_EXTRA_CFLAGS" into linaro_android_2.3.5