(Android Phoenix) Camera Java functions - some small cleanups