Add missing includes.
am: 06c7a6f3cd

Change-Id: I6831a59bfe1f5929ed42d079d8d7a0a795549099