Merge "Build consumerir.default with BOARD_VNDK_VERSION"