* commit 'e711e8dae1b2c3cbe790d0e8d627232f6418df43': Camera2: make videostabilization type consistent