Fix some -Wconversion warnings.

Bug: 21161908
Change-Id: If8d1703c9773eaaed5ea2557833cde32ced97bff
11 files changed