Product and subdir makefile caching 2/2

Change-Id: I2c7bbd4659a570577ae75ac082aacd49326c1ecf