Add missing includes. am: 06c7a6f3cd am: 8c5d732479
am: bdf11cc3d6

Change-Id: Ic4e9a30bff61b49a4687e416f36a9763baeb488a