Merge "Fix build."

__BEGIN_DECLS

struct ion_handle;

int ion_open();

int ion_close(int fd);

int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,

#include <ion/ion.h>

#include <linux/ion.h>

#include <linux/omap_ion.h>

size_t len = 1024*1024, align = 0;

int prot = PROT_READ | PROT_WRITE;