aries/Camera.apk minor fixes