am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev

* commit '6c380fe5da492c526f81c894a069e63ab62613de':
  add renderscript to support library javadocs