Merge "Revert "Mako: Fix sdcard permissions for native apps."" into jb-mr2-dev