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

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

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