aries/Camera.apk fixes