Updated code to be compilable under Android/libc++