am b6327778: am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of...
am b6327778: am 1a65d5b3: (-s ours) Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev
* commit 'b6327778':
Fix building on modern versions of Xcode and OS X.