Merge "Address const issues in preparation for libcxx rebase." am: 64ade5d

am: 170c93f

* commit '170c93f57fba11aade98caaffefb8d65dc7c864e':
  Address const issues in preparation for libcxx rebase.

libs/hwui/RenderNode.h

@@ -145,7 +145,7 @@ public:
 
     void setName(const char* name) {
         if (name) {
-            char* lastPeriod = strrchr(name, '.');
+            const char* lastPeriod = strrchr(name, '.');
             if (lastPeriod) {
                 mName.setTo(lastPeriod + 1);
             } else {