Merge "Add android.net to proguard flags"