Merge "Move the hacked-up glob.h off bionic internals. am: 20e0898b96 am: 43ad9fcb9b" into nyc-mr1-dev-plus-aosp