[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" into stage-aosp-master am: 66d58f5925 -s ours
am: f5b0727d72 -s ours
am skip reason: change_id I33010b5604d8140f3a50845c16daff743504c8d0 with SHA1 86fdb97cbb is in history

Change-Id: I64fd6f1a8dbe53f4e4f33184fc00c6c645791cfb