Bug 522137: fix some trivial build warnings

  no functional changes

Change-Id: Ia92c444de8c0ef2d1c90f02e065e33ef814e234d
12 files changed