Merge "Add skeleton for multihal 2.0"