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

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

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