Get rid of novatek (2/2)

Change-Id: If4f60cff6cb02eb53ea11d5b89a7e75e724c5a63