Merge "Strip .fs extension from filename for C++ NDK reflection"