Fix clang build breakage (-Werror -Wformat).
am: b334c33d65

Change-Id: I36f6e388d8294d5650c2bcc1ab2eaec81e09a263