Merge "Ensure that BOARD_VNDK_VERSION is current"
am: 4ef5040cc3

Change-Id: I79f43fa6db5f043122fc17c2d89c03bfc0690494