[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: a8cd634bf0 -s ours
am: 4c044565d0 -s ours
am skip reason: change_id Iab077f256ff3776495302606572f384d82ab171f with SHA1 e3ceaed976 is in history

Change-Id: I6e3d1e1acc7f69b627f783c7df598296cbe83c09