Revert "Don't force prepend I to header file names"
am: cc14a584a3

Change-Id: I7d023dd58facc31a55154086ad1036fd64568f30