am a6061104: Merge "Fixed build errors originated from stlport"

* commit 'a6061104795167e1bb7e625ef76014ca1021a067':
  Fixed build errors originated from stlport