If you are using the 117 source, then you need to use the hi_116u4 file. If you plan on compiling 117u1, then the order would be to patch the 117 source with the 117u1 diff and then patch with the hi_117u1 diff.
Also, it would be a good idea to do a clean compile. To be safe, delete everything and start over. Good luck!