Merge "Mark two ContextCompat methods static." into mnc-ub-dev