Merge "Remove proguard.flags from shared/" into tm-qpr-dev