Android 6.0.1 release 21
Merge "Add missing <unistd.h> include for read and close."