Merge "Fix namespace inconsistency in .so loading patch"