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

* commit '512c1e24fb9afc1b71d8a2aefa27aad05255a587':
  [RenderScript] typo fix in Allocation.java