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

Change-Id: Id496286b1745e83c5150397334cf20f8204249b9