Merge "boot_control_copy: switching to C++" am: 512f4b15b2 am: 37a744bcfc am: f23f04c04a
am: 329cc5dbf9

Change-Id: I15459f76988fa23e344ec85ac2c9e7ef6c6df1ff