Change to CM camera.apk

Change-Id: I984de6b6d871ed1693705e49ca93acd3edcc659e
Merge "Change to CM camera.apk" into 4.4