am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit '11190d0ccb1216307043ceecf5360f1a1a946cd1':
  restorecon /data/misc/media.