Merge pull request #19855 from komakai:fix-android-ndk-camera-conversions
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Apr 2021 21:31:26 +0000 (21:31 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Apr 2021 21:31:26 +0000 (21:31 +0000)

Trivial merge