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

Change-Id: I15f9dd0b3b06be0c0d0021f3f74ec0772f0bd14b