Merge "Support to build executables against the NDK"