Fix NDK Module
Implement previous UI Legacies