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

Change-Id: I752d9f784c9e7787e7bce64545cba79cee1838f8