Merge "Recognize dynamic res ids as valid"