Merge "Increase margins for dex2oat_image_test"