Merge "Bug 5585323 New system permission for media decode" into ics-mr1