Merge "ABI: eliminate spurious blank lines before CRC diff lines"