[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c799747103 -s ours
am: e5917770d1 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 bbb75b1263 is in history

Change-Id: Ib01eed6e0284a2f12c224807c3972e4bac174769