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

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

Change-Id: I040b02bc12f8f7ad4de82d4a12cf57a23410a729