Merge "[incfs] Fix the block size calculation in .so extraction" into rvc-dev am: 3e188ae81d am: c8a5790bd7

Change-Id: I3f74edac36894dc59b60b3438475ec338cd3f88f