Merge "Ensure that BOARD_VNDK_VERSION is current" into oc-dev am: 8a6d7fabc3
am: d3d15935f9

Change-Id: I106a9b4c07334389b2686a159cd6f407fafaec2e