Merge changes I596e00fa,I89fda42d into nyc-dev
am: 44f546a

* commit '44f546aa68231f466e629e53240030f9cefc3e84':
  [RenderScript] Fix IntrinsicConvolve documentation.
  [RenderScript] Update the documentation of Script.LaunchOptions

Change-Id: Ib2ffa5a97d5bbc8264f3442d20aecf3ddec65ef1