Merge "Remove dex2oat_headers." am: 0fd8d7970b

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

Change-Id: I9074a315e3299416fc7af15655bc010fa5d1a62e