Merge "Skip symlink when estimating apex size" am: e22ac8f966
am: a2187fb1c8

Change-Id: I55a0124ea094ffcfc9436e751dfd09fb03c8f634