Add missing includes.

Test: mma
Bug: None
Change-Id: Ie8a4f93552bf3221be5100b5962e3d570546364a
2 files changed