Merge "Multihal 2.0 - Implement SubHal discovery"