[automerger skipped] Renderscript: rename .rs extension to .rscript am: 623d087c54 -s ours am: be7f0ae065 -s ours
am: 40a65d5fd8 -s ours
am skip reason: change_id I10a23ceee696df7fe363cc5d825e45100565cbdf with SHA1 3a6b92a98e is in history

Change-Id: Ib3e236925978c0b9d27bc5150a3817c9ddc8359e