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

Change-Id: I35dafe7b1f4b3d4181291277adee3cffabd15d98