Merge "fix darwin and ios build error"
authorErich Keane <erich.keane@intel.com>
Thu, 6 Nov 2014 01:27:53 +0000 (17:27 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Thu, 6 Nov 2014 01:27:53 +0000 (17:27 -0800)

Trivial merge