Merge "libstagefright: Fix HDR profile mapping"