squashed: remove kitkat ui changes

Revert "camera2: update to new 4.4 KitKat UI"

This reverts commit 8eda2e006d96e73e5b8a9735b9cd8b03faca9eb6.

Change-Id: I63b28306db1eb014633638877a4988ae5e454bf7

Revert "camera2: follow new 4.4 UI guidelines"

This reverts commit f11259eccd42cd861aa2abed0f314c8cc83992e2.

Change-Id: Ib42e13717f72fcf3b4d21fb2b9ce3aa24a295716