Add headers needed for AOSP

Change-Id: I482bf99e71f15f8a129ea7562a99d8073e810e3b