Merge "libgralloc: include <sys/ioctl.h>"