am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1

* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363