Android p preview 5
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW1jB6AAKCRDorT+BmrEO
eOV8AJ9XX7ZaUqw5k8sUsAFTeeMnl4chdgCfQfwqXyv9F8eBEcPUxB7/QM5FwaI=
=6HCO
-----END PGP SIGNATURE-----
Merge "cutils: move hashmap to <pthread.h>."