am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
  restorecon /data/misc/media.