Merge "NDK files - do not merge" into lmp-preview-dev