Revert "fixes to build with gcc 4.7"

This reverts commit 509d073c72b9cdb2f2bd38d75be8bf5a4023e060.

Conflicts:
	libs/hwui/FontRenderer.cpp
	libs/hwui/ShapeCache.h
	libs/hwui/TextDropShadowCache.h