Merge "Build libmedia_omx with BOARD_VNDK_VERSION" into oc-mr1-dev
am: 49ef2a9a52

Change-Id: I5466df8e89bdec501f3566f982863794f1544f59