Fix Content name collision in Android

Author: Caitlin Bales (MSFT)

Templates/Android/generated/BaseEntityRequestBuilder.java.tt

@@ -79,6 +79,9 @@ if (c.AsOdcmClass() != null)
 	foreach (var prop in c.AsOdcmClass().GetProperties(typeName:"Stream"))
 	{
 		var propName = prop.Name.ToCheckedCase();
+		if (c is OdcmMediaClass && propName == "Content") {
+			 propName = prop.Type.GetReservedPrefix().ToCheckedCase() + prop.Name.ToCheckedCase();
+		}
 		var propRequestBuilder = TypeRequestBuilder(prop);
 #>
 

Templates/Android/generated/IBaseEntityRequestBuilder.java.tt

@@ -54,7 +54,11 @@ if (c.AsOdcmClass() != null)
 <#
     foreach (var prop in c.AsOdcmClass().GetProperties(typeName:"Stream"))
     {
-        var propName = prop.Name.ToCheckedCase();
+		var propName = prop.Name.ToCheckedCase();
+		if (c is OdcmMediaClass && propName == "Content") {
+			 propName = prop.Type.GetReservedPrefix().ToCheckedCase() + prop.Name.ToCheckedCase();
+		}
+
         var propRequestBuilder = TypeRequestBuilder(prop);
 #>
 
@@ -73,7 +77,6 @@ if (c.AsOdcmClass() != null)
 #>
 <#
     foreach (var method in c.AsOdcmClass().MethodsAndOverloads()) {
-
         if (method.IsBoundToCollection) {
             continue;
         }

src/GraphODataTemplateWriter/CodeHelpers/Android/TypeHelperAndroid.cs

@@ -20,6 +20,11 @@ public static HashSet<string> ReservedNames
             }
         }
 
+        public static string GetReservedPrefix(this OdcmType @type)
+        {
+            return ReservedPrefix;
+        }
+
         public static string GetTypeString(this OdcmType @type)
         {
             switch (@type.Name)