Merge "Typecasting to disambiguate abs call in preparation for libcxx rebase."
am: f6556f0

* commit 'f6556f0b1c0a5ed13e7cbb2d7e05d2ca10d8811f':
  Typecasting to disambiguate abs call in preparation for libcxx rebase.

Change-Id: Ie2aa601c81dcde20228425c386f02b7a9924833e