Merge "Switch gcnodir name from basename to just removing .so"