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

Change-Id: I590e3c282b2f642333b2059efa4338526b91757a