Merge "Fix warning from clang+mingw"
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8