Merge "Update to allow multiple HALs in a manifest." into oc-dev
am: 1011062e1a

Change-Id: I3ed6dfa6daa5750a1c5262431fb876fa5203a824