Merge "Add a dist goal for the NDK."