Merge "Move to RenderScript.h and new sp<RS> API"