Revert^4 "Add the mainline framework boot image extensio... am: 7da3956e3f am: 6c17e53dab

Original change: https://android-review.googlesource.com/c/platform/art/+/2470962

Change-Id: I4282c3c9491ee3c0d9e2b234a892085a3db756fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>