Merge changes from topic "revert-1913972-revert-1909696-aosp-image-ci-mismatch-NCXVEHFTRL-ICIHKZOSQY"

* changes:
  Revert "Revert "Fix VkImageCreateInfo mismatch for AHB sibling V..."
  Revert^2 "Rerun codegen"