Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev