Revert "the forgotten camerawrapper + some stuff from @tonyp"

This reverts commit 7030a0b983dfc63005cca2f4f27660358bcc6e32, reversing
changes made to f643e12768396d3022fa9ba885095ddb6dc892fc.
disable dalvik logspam

Change-Id: I4e1a9758d06f08decfb7b7219a48b66a548438dc