Merge "mediacodec: allow access to /data/user" am: 3b410bb0d8
am: dafedf866f

Change-Id: I355d96edb3495da9bde908aecb2bb48355aea373