Merge "libsparse: Fix odd-sized input files total_blks" am: 652ce94f40
am: ab74c778df

Change-Id: I5bc6a0df02d86fa0f56f866ebdcb18314858634a