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

Change-Id: I7e12ac2f354fb545cf8e2c7e648350632797fb19