Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc"
am: 8418634e70

Change-Id: I3848c66092e8f7f89e80697991df92a08a71e5ed