Rename hidl-cpp to hidl-gen

Change-Id: I63b00394c966b81218f25e2b92b066e59a31a6ac
diff --git a/templates/TemplateBinder.h b/templates/TemplateBinder.h
index 8df7fcb..85af41f 100644
--- a/templates/TemplateBinder.h
+++ b/templates/TemplateBinder.h
@@ -1,15 +1,16 @@
 // SECTION binder
 // START file
+// AUTO_GENERATED FILE - DO NOT EDIT
+// see system/tools/hidl/templates/TemplateBinder.h
 #ifndef I_HIDL_BINDER_header_guard_H
 #define I_HIDL_BINDER_header_guard_H
 
 #include "binder/Parcel.h"
 #include "binder/Parcelable.h"
 
-namespace android {
-    namespace service {
-        namespace media {
-            namespace rtstreams {
+// START namespace_open_section
+namespace namespace_name {//ALL namespace_open_line
+//END namespace_open_section
 
                 class package_name : public Parcelable {
 
@@ -53,9 +54,9 @@
                   // END vars_decl
                 };
 
-            }
-        }
-    }
-}
+// START namespace_close_section
+}  // namespace namespace_name  //ALL namespace_close_line
+//END namespace_close_section
+
 #endif // I_HIDL_BINDER_header_guard_H
 // END file