Merge "system/media build with BOARD_VNDK_VERSION" am: cbb4d8f8dd am: a383206dfb am: 3914814003  -s ours
am: 17c6e54c3b  -s ours

Change-Id: I41dc8de23a76cf150a9e2fcaad613b11cf030a83