merge from open-source master

import android.content.pm.ProviderInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.PackageParser.Package;

import android.content.res.AssetManager;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.StatFs;

import android.os.Vibrator;

import android.os.FileUtils.FileStatus;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.text.ClipboardManager;

import android.util.AndroidRuntimeException;

            }

            if (!mFilesDir.exists()) {

                if(!mFilesDir.mkdirs()) {

                    Log.w(TAG, "Unable to create files directory");

                    Log.w(TAG, "Unable to create files directory " + mFilesDir.getPath());

                    return null;

                }

                FileUtils.setPermissions(