Merge "Remove bionic's internal ctype-like inlines." am: 33822d6161 am: 7c316939ad

Change-Id: I8184c7051f25dc86148f84d108588bf4c6cc75bb