Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" am: 8418634e70 am: 93e6339613
am: d89f523bdf  -s ours

Change-Id: I0c9097f952504a8b773c4a098bc762f6ed8d04bc