Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"