Merge "Skip symlink when estimating apex size"