Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Ib91e9f91f82de7035c43e5c71192f49564a361be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>