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

Change-Id: Ice04fd548c584a8fd71ab5e7dcd42c42605bb603