Merge "ENFORCE_VINTF_MANIFEST on hikey*"