am 18e39c2d: am 79f7d687: Merge "[RenderScript] typo fix in Allocation.java"

* commit '18e39c2d23d68f7f754ea8b6194a8c6feb62bf8c':
  [RenderScript] typo fix in Allocation.java