These headers are missing a few #includes to allow their direct inclusion from C http://b.android.com/79841 Change-Id: Ifc712c17f4da70b26adb67d4d49ed659f53c3621
Change-Id: Id47514a1812d828e95efa2fab0e9c15c5b682b58