Fix build issue with "round".

Change-Id: I270fa8cd35075c131de90780715c7232b801c587
Merge topic 'introduce_histogram_representation' into next

6e587155 Fix build issue with "round".