Generate/skip padding and use new prefix for ICS.

BUG=5609007

Change-Id: Ia69fa45e0f728914a4c5de1a531f367dda165dba
diff --git a/slang_rs_reflection.h b/slang_rs_reflection.h
index 4e75208..c2e9c75 100644
--- a/slang_rs_reflection.h
+++ b/slang_rs_reflection.h
@@ -59,6 +59,7 @@
 
     std::string mPackageName;
     std::string mResourceId;
+    std::string mPaddingPrefix;
 
     std::string mClassName;
 
@@ -112,12 +113,14 @@
             const std::string &InputRSFile,
             const std::string &PackageName,
             const std::string &ResourceId,
+            const std::string &PaddingPrefix,
             bool UseStdout)
         : mVerbose(true),
           mOutputPathBase(OutputPathBase),
           mInputRSFile(InputRSFile),
           mPackageName(PackageName),
           mResourceId(ResourceId),
+          mPaddingPrefix(PaddingPrefix),
           mLicenseNote(ApacheLicenseNote),
           mUseStdout(UseStdout) {
       clear();
@@ -155,7 +158,7 @@
     // Will remove later due to field name information is not necessary for
     // C-reflect-to-Java
     inline std::string createPaddingField() {
-      return "#padding_" + llvm::itostr(mPaddingFieldIndex++);
+      return mPaddingPrefix + llvm::itostr(mPaddingFieldIndex++);
     }
 
     inline void setLicenseNote(const std::string &LicenseNote) {