DO NOT MERGE - Fix improper declaration/use of pointer.

https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
Handle user-defined cache path for RS.

Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
Merge "Handle user-defined cache path for RS."
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base into HEAD