Merge "[RenderEngine] Add hybrid Log-Gamma support." into pi-dev
am: 5a5e992e9d

Change-Id: I37c71f044eaaa63c6e9520a710bb2f49098b64cc