Merge "Rename CacheLocation to Paths."
am: 49c7f1cec3

Change-Id: I335f1df6699d8316d41959c21a09cbf944d7554b