am: ad431d2e * commit 'ad431d2e': Fix overflow in path building Change-Id: Ifa2970afd2862bef780904f2b91a307c16f7a7b8