Merge "get_mounted_entry_for_userdata: Realpath block devices from fstabs"