Fixes to build on gfmn100.

Change-Id: I012610511056cd2d173d04f07ee86a233f2c95a8
2 files changed