Merge "Update to allow multiple HALs in a manifest." am: dd315948db am: f3e73b9f5f
am: c8316072b6

Change-Id: Ie9767302013432944beadcf8794fd78fb6718ebd