Merge "build: clean up proguard_flag_files"