Merge "Update mdpi resource with 2.0 style icons"