Merge "libstagefright: Fix HDR profile mapping" into tm-dev