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

* commit '7ef7e5dab3d9df82852af7f16f94ece4feec4749':
  Fix host build with clang 3.3

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