Merge "Do not add empty <vndk> tag to device compatibility matrix"