Merge "Use ManifestHal constructor."
am: 5e22392cca

Change-Id: Ib9d909f36575ded0c3eb9a914135e9d0f42951f1