Merge "Use ManifestHal constructor." am: 5e22392cca
am: ff3fc212b7

Change-Id: Ic054315830d7ecdcd3a049c96cd902ba530010d3