Add missing includes.

Test: mma
Bug: None
Merged-In: I27d0860770f40b0d210277fbbf0242db450e0e0d
Change-Id: I27d0860770f40b0d210277fbbf0242db450e0e0d
2 files changed