Camera2: minor style update

Address some style comments didn't make it merged with original
change.

bug 16979905
bug 15773663

Change-Id: Ic15381a2a4b1abbf69b595234386cb8490787afb
2 files changed