Merge "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB" am: c032734399
am: 48320ee9d2

Change-Id: Ie9997fb415a7938b786047de8a0e69ad0b057df5