Add missing includes

Test: compiled
Bug: not applicable
Change-Id: Ie4007970f83e5d08b2d35e78a49d93d696809d7b
2 files changed