camera changes

Change-Id: I6bf03db138e783818b4450d694a011d6369cf104
Merge branch 'kitkat' of https://github.com/paolo-red1/android_frameworks_av into kitkat