Merge "FileSystemPermissionTest: add /data/data/recovery/HTCFOTA add /data/data/recovery/OMADM"