Sm4.9 patch

This will fix some of the building errors.  One or more flags was conflicting with graphite.  Not sure which one.  Maybe some of these flags can be added back at a later date.  I don't have this device so I can't test..