am 73524a91: am bc5de16b: am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"

* commit '73524a91cd2d136099169640e46b96a9135dcbe8':
  Fixed API18 math.h for clang3.4