Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb