Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1