Merge "Move default multihal configuration file to /vendor/..." into oc-dev
am: d3f4f14218

Change-Id: I569ec7b877e88b7a119ea22485cdfe59ab12573f