am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit '8830b53b76c05416c021df3eb0cea1dd541bc3ac':
  Label existing /data/mediadrm files.