Fix build on Xcode 4.6, release 2.4.2.

Change-Id: I4f1d6e526b75506eefbda26dd823efb4354d1636