am: 4830087b * commit '4830087b': Fix overflow in path building Change-Id: Ie2044be5b1c31b1fe128c90eda1c5df169dc0a3d