Fix the build for Xcode 5.

Change-Id: Icf8a4917d23114dae62a0e8ac3563587c3bf0361
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2