Putting it in a subdirectory on solver is no longer necessary since
python3 started delivering to INSTDIR, so lose the crazy naming.
Change-Id: I17e924e5d872768a64f6a3112f1294f3def7120e
I am constantly amazed at the creativity of the original makefile
writers. An extra header file, processed by sed, rather then adding one
item to CDEFS? Really?
Change-Id: I41ae8b10fc447ea5ab91e767c8afb87e39b9b5f5