Merge "Fix generating id in android namespace"