Add missing includes.

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