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

Change-Id: I65e584b3fb56aea64a466afb933d9085ab35117a