[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c799747103 -s ours am: e5917770d1 -s ours am: 41c6f6c957 -s ours
am: e3f8e17670 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 e98dce083c is in history

Change-Id: I47c290c60cadb68a4330b6110a0b99e156358f09