Merge "fs_mgr: Remove the timeout parameter to DestroyLogicalPartition."
am: cd22e3a6f6

Change-Id: Ia3e60d52b9a6e6f9549ed0d9b07aee80dcba16d2