Merge "Add a few more legacy inlines for strto*_l." am: 13dec2354d am: b64f3fe81d
am: 4279b99059

Change-Id: I8e16eb772b0d01a4329c64ad88ee7c8bd97db031