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

Change-Id: I9af8bdee3cc87480c4d1f55a285b08c3cfe7aa66