Merge "gralloc: add gralloc4 HDR metadata support"