This caused trouble for stlport. (cherry picked from commit 5e9b20f7) Change-Id: I85d09c12c6de1e8502f83e0ef0f17747fdfe08a5