Merge "Allocate a GID range for external cache files."
am: edaed3ed7a

Change-Id: I15399bb3ce95bf52e6ab2d0585598bdf7774c480