[automerger skipped] Renderscript: rename .rs extension to .rscript am: 9d532d5695 -s ours am: 8c465162c0 -s ours
am: 16f303306d -s ours
am skip reason: change_id Iab077f256ff3776495302606572f384d82ab171f with SHA1 4a8876ec9e is in history

Change-Id: I1c3a7cc94c5b5e28c099ef7ed4ad08707c66159c