Merge "Makefile: exclude cache symlink on devices with no cache partition" into nyc-mr1-dev