Merge "Add more extra space for dexlayout writing"