Camera2: Fix indentation and whitespace

Change-Id: I424aea6141f9ba2a698d29b3e5f60d5c57291c57
Camera2: bring back support for Samsung HDR format

Change-Id: I01e81f347228617b892598ea0d4f80f818bf17d0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0