Merge "Revert "ANDROID: Add simple fuzzing targets for video and video+audio encoding.""