Merge "Remove stale SYSTEM_ROOT_IMAGE board config for old kernels"