Merge "Remove dex2oat_headers." am: 0fd8d7970b am: ee49a5a3be am: 361c989296 am: 574538867f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1408233

Change-Id: I6e14b27b13ce5b7d239e8ad871547988f7599313