Merge "hikey960: Add version check on the hisi vdec package" am: 7c2f3413d0
am: 72e15a43c3

Change-Id: I04e0081fdfebb6c2db0ce1931c0ba7027ceefc2c