Merge "Add jdduke@ to services/proguard.flags OWNERS"