tree 16a11ff5a78862defcc169b0af2901360a57ab6a
parent b3016551e5f264264dbb633a1ddf03ac97f9c66c
author Ian Rogers <irogers@google.com> 1398909867 -0700
committer Ian Rogers <irogers@google.com> 1398958261 -0700

Fix a few 64-bit compilation of 32-bit code issues.

Bug: 13423943

Change-Id: I939389413af0a68c0d95b23cd598b7c42afa4383