Don't force prepend I to header file names
am: 7df2c34b6e

Change-Id: Iaec077af6a9e114a7e6881f2294e279b31e220ab