am 52ba5b08: DO NOT MERGE. Update for new RS library with ES 2.0 support.

Merge commit '52ba5b08f25e031a6f717551c75abf630b92ed8b' into eclair-plus-aosp

* commit '52ba5b08f25e031a6f717551c75abf630b92ed8b':
  DO NOT MERGE. Update for new RS library with ES 2.0 support.