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

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

Change-Id: I873ac2957259b6c55b5b5c5b35c76f1e57cba38d