Merge "ndk: Avoid memory leak in failure case." into nyc-dev