Merge "system/media build with BOARD_VNDK_VERSION"