Merge "file_contexts: Marking /dev/block/mmcblk0 as root_block_device"