Merge "Increase margins for dex2oat_image_test"
am: efe35f4105

Change-Id: Ie7914a26fc6f6b5e1b1fcfde8567fd71a0af6b1a