[automerger skipped] Renderscript: rename .rs extension to .rscript am: b4990fa6fa -s ours am: 7fdff6402e -s ours
am: 74ac945418 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 e98dce083c is in history

Change-Id: I399ab5506c4375f0fe8c95c786c4b833c07894e6