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

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

Change-Id: I81afab71580c63c1a14ae7e7be0c22e68342824d