am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit 'c8f69926325e0653ba4244dbd041c2d29b784194':