Camera2: Fix indentation and whitespace

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