Merge "Remove dex2oat_headers."