Revert "Graphite optimizatoin flags"

This reverts commit ad7098de55e23df2074253a45d062c3178ca4028.

causes issues with amazon/currents/etc

Conflicts:
	core/combo/TARGET_linux-arm.mk

Change-Id: I527f5ccc19888a98b0da69d6984104083edbc568
Graphite

Readd graphite enable indicator
only going to enable graphite flags on skia

Change-Id: I67e23ec68a541f0dc5d2aef556c0eb229d42a730
Merge remote-tracking branch 'upstream/jellybean' into HEAD