Merge "Workaround perdev_minors path change in Linux"
am: d3870c5167

Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771