[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: b77682993c -s ours am: 7612bf2d2c -s ours
am: a8714b7ca4 -s ours
am skip reason: change_id I53417fc10c589a845e1cefe8d41f71f8a8de1097 with SHA1 932a945721 is in history

Change-Id: I7a8367f8770f7f343e830a5bcdcdb253d8788963