Merge "libgralloc: Change ion_allocation_data fields." into jb_2.5