Don't rely on transitively included headers am: e6474b7fa2  -s ours
am: 78c47e7f02  -s ours

Change-Id: I2242ce1aa7256aa6749552dd89c1f0eca6f48e7b