am 48c4199e: am 17d25c56: Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb

* commit '48c4199ee6f33e132226dd9b7b527a47eba8d008':
  b/3369602 Using Math.round() to convert float coordinates to integers.