Merge "gralloc: add IAllocator/IMapper 4.0 to frameworks/native"