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

Change-Id: Idb97d7108e8c750739943b991a2468f3aa87fc83