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

Change-Id: Icb076db3290b8c4fad9db4ab343963197bae2ede