Merge "Update AppCompat's public resources" into mnc-dev