awong-dev/ndk — pull request #156 by nico (2014-06-28 16:13:04+00:00)
Title: remove duplicate stuff after merge; reduce downstream diff

Change-Id: I662a8fc24f776ebf30476e6d638b22bb63d94e5a