Merge "Make new ResourcesCompat methods static" into mnc-ub-dev