Proper split of BootControl and DynamicPartitionControl.
am: 3a1a561839

Change-Id: I3caeb55d696c2d60cdcffd0a35bb851a67e6d9e7