Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo