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

Change-Id: Ia477327f1284271379b3a47cd8720ce4899812cb