Merge "Revert "Convert from HIDL mapper to libui GraphicBufferMapper"" into main