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

Change-Id: I5eac918046ef39dce26276cf61bcc3db76912572