Merge "Ensure that BOARD_VNDK_VERSION is current" into oc-dev