awong-dev/ndk — pull request #43 by nico (2013-12-18 18:15:25+00:00)
Title: import downstream changes to reduce our diff

Change-Id: I8f6ca70a6625b1250bb205ae1f062988324a5670