Camera2: Fix video button size

Fixed this - http://review.cyanogenmod.org/#/c/71250/ (Ruukku Puu's comment)

Change-Id: Ia21b64e398e3b7d5aba0ac7a35cc506ffedd05a6
Camera2: Remove unused strings

Change-Id: Ib51dddc7856bddd3706d166eee6bc7ae9495b049
Merge branch 'cm-11.0' into kk_mkt