Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread