fix merge breaks

....

 Changes to be committed:
	modified:   core/jni/android_util_Process.cpp
	modified:   libs/androidfw/ResourceTypes.cpp
	modified:   libs/hwui/FontRenderer.cpp
	modified:   libs/hwui/ShapeCache.h
	modified:   libs/hwui/TextDropShadowCache.h
	modified:   media/java/android/media/RingtoneManager.java