Merge "Add dexlayout option for updating checksum"