[ros-diffs] [mkupfer] 35161: - fix acpi.inf and convert to utf-16 - convert utf-16 files back to windows line endings (sorry, mistake of my merge tool)