Resolves build errors for armv7, armv7s, arm64.

Minimal fixes for resolving build issues for XCode 5.1