Merge "Move setting default BOARD_VNDK_VERSION value" into main