Revert enable GRAPHITE breaks build with 4.8

Change-Id: I5182b27a728660385c6bb22f0a66dc0d9c490208