Revert "Allow manual clearing of makefile caches for adding products, etc."

This reverts commit 20dbd0af9bd8e083f3eb1c385fb3dbcaca554c8d.

Change-Id: Ia8dbac4525078f3e0cbe2f3b7c31b67ee3b54b10
Revert "Cache subdir makefiles (1/2)"

This reverts commit 937a3bb12664164e6b30873309809a6681e9992c.

Change-Id: Ifc388f16bd0379cab532fedbc072c7a5106659d3