freezer.h: update from 3.4.49 merge and fix compile errors.

Change-Id: I97c1b1baf53a040c029cc254c04b6205825b6b7f