Merge "Reduce warnings in memtest compilation" into gingerbread