Merge "Update NDK with recent changes." into gingerbread