adb: fix handling of conflicts

Ensure not to mask away previously set APK_VERSION_CONFLICT when serializing.

When deserializing, make sure to actually write out the conflict flag when no version part is set.

When creating apk_dependency, ensure to set the conflict bit correctly and mask it off result_mask.

Fixes #10824 (closed)

Will fail CI until !101 (merged) lands.