am 21b2ec79: am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '21b2ec7980b405f5c808a265c04cc1b3f1ae23de':