Merge amd64 NDK from amd64 branch: