Merge "Fix androidboot.bootdevice test case for bootconfig"