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