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

Change-Id: I318094545c8da7f37daaa0ff3c029890325d3a72