Android: revert 3.x camera