Merge "Fix a warning in generating id in android namespace."