Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...