Revert "use Mustaavalkosta's Camera2 fork"

This reverts commit 1c1a30afd5918604fa9c783e4d4a8a1bd9ace404.