Merge "Migrate libphotoviewer to androidx"