Update ndk cleanup

@dshirley Please review and let me know if there are any changes needed. Thanks.