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

Change-Id: I397c65915d76c9b2c0ebbec0e46f3394d5fa756e