am b3016551: Merge "Fix host build with clang 3.3"
am b3016551: Merge "Fix host build with clang 3.3"

* commit 'b3016551e5f264264dbb633a1ddf03ac97f9c66c':
  Fix host build with clang 3.3

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst