[automerger skipped] Renderscript: rename .rs extension to .rscript am: 932a945721 -s ours
am: c5e0996a2f -s ours
am skip reason: change_id I53417fc10c589a845e1cefe8d41f71f8a8de1097 with SHA1 60579e1396 is in history

Change-Id: I98c2b77d1f522d096be668b91dbc9acdfd97c491