Merge "Revert related work of extractNativeLibs default flip"