Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev