Camera2: bring back support for Samsung HDR format

Change-Id: I01e81f347228617b892598ea0d4f80f818bf17d0
Merge branch 'cm-11.0' into martincz