am 3e9c9ac5: am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '3e9c9ac5ee7a36653b90cb86eb6445496b536c16':
  Close a security hole - do not give world readable/writable access to /data/drm