Merge "[incfs] Fix the block size calculation in .so extraction" into rvc-dev