Merge "Don't resolve already resolved paths when parsing ld.config.txt"
am: 72aafad950

Change-Id: Iba213a946cc411781a1661e74bc887e93c9c310e