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

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

Change-Id: Id6a321f1e0b1ff2148f249b82c2157504515bc86