Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev