We don't need those header search paths anymore for Demo-iOS.
Remove the header search path on master, too.
Merge branch 'master' into arc