Merge "ENFORCE_VINTF_MANIFEST on hikey*"
am: 67bf85d9da

Change-Id: I05495ad973f2f39c073ff3a42aeebc74f0f46002