Merge "Build libmedia_omx with BOARD_VNDK_VERSION" into oc-mr1-dev