[automerger skipped] Renderscript: rename .rs extension to .rscript am: 6235cd99df -s ours am: a789bd6188 -s ours
am: 726412193d -s ours
am skip reason: change_id I10a23ceee696df7fe363cc5d825e45100565cbdf with SHA1 623d087c54 is in history

Change-Id: Ic6609e14fdc051a025d5d5b3dc2bca217334babc