Merge "liboverlay: remove warnings during compilation"