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

Change-Id: Ib51db498f429526f9bf43e0c340d0e5e41dbdd52