Merge "Remove stale proguard.flags reference"