Android p preview 5
Merge "cutils: move hashmap to <pthread.h>."