Update to upstream d2d1ea9.

Bug: http://b/19149083
Bug: https://github.com/android-ndk/ndk/issues/106
Change-Id: I89d54ca00305813c51f4233dec02ca3a5860ead9