[automerger skipped] Renderscript: rename .rs extension to .rscript am: ab33ac980a -s ours
am: 2dc1486468 -s ours
am skip reason: change_id I33010b5604d8140f3a50845c16daff743504c8d0 with SHA1 86fdb97cbb is in history

Change-Id: Ia7f3563f4053a90ea647fb60fbd497df8de836ae