Merge "build: clean up proguard_flag_files"
am: 7cd5386b51

Change-Id: I7bc2cf26372745ce2b18b7525a340ab5557c92bd