some fixes for macs

Change-Id: Iaa2a54bcfa67e52fd6ccd346d89d3a6a960b0d53
fix glyph memory leak and issue on intel

Change-Id: I68652c7397f806e544dd2bbef7a2c009755cf3f2
Merge topic 'intel_fixes_and_leak' into master

411263db fix glyph memory leak and issue on intel
af59eb1e some fixes for macs