Merge "Updated fuzz_config in Android.bp files"