Fix compile failures.

Change-Id: I0d8abf275f8f1eb12eebc11b2c8cba08abb58667
14 files changed