update to support build with android NDK r9;