Update graphite flags for >=gcc-4.8 and cleanup my code style to be more consistant with David's
Merge remote-tracking branch 'upstream/kitkat-remix' into kitkat-remix