Merge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28
am: d3d51e5066

Change-Id: I92db6e376ef7f4ff5979e31b830b6d17a6886c03