Merge "Specify SDK version for RS graphics tests." into jb-mr2-dev