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

Change-Id: I9139b69f535b935773fa9a4aaef3c95478a72955