Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev