Merge "Change the instrumentation of android.renderscript to self" into lmp-dev