vintf: VendorManifest -> HalManifest am: 8e0cfc6a0c am: 8d24ebb475
am: 144a9ee67a

Change-Id: I3f1c8af9fa453bf11560bc311f264fceffd6f942