Android 6.0.0 release 2
Merge "Tell config.h that we have <endian.h>."