Revert "Don't force prepend I to header file names" am: cc14a584a3 am: 2133f7fdd0
am: 4aa7867b72

Change-Id: I969ee261037d1baa9e2e9227b10bc428b9b200ad