Merge "system/media build with BOARD_VNDK_VERSION"
am: cbb4d8f8dd

Change-Id: I1200ca2f56589c530d9bb1435c8517a3e23a5ccd