Merge "Add WRITE_EXTERNAL_STORAGE perm to libcore tests"