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

Change-Id: I7fb1f40c6acb13bf84b43ed8094a7c75d3e0acab