Merge "Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE"