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

Change-Id: I3c7afcd7a3a3bab4460123751d0a5696cb1892c6