Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 am: 78b7d28908 am: c44d96b20d am: 2f2ba98031

Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543

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