(Playbook) Some build fixes/take out some BB10-specific defines