sync: clean up compiler warnings

Signed-off-by: Erik Gilling <konkers@android.com>
Change-Id: I8a2ec5db652c61fd04571402067b37273b91e78f