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

This reverts commit 7df2c34b6e40828fdf362c665911173e188fe1c4.

Reason for revert: Possible cause of break in stage-aosp-master

Change-Id: I89f2c1c5b645c2434eaac149c32b8220555225e4
5 files changed