Merge "import init.${ro.hardware}.rc last to allow overriding default USB configuration" into jb-mr1-dev