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

Change-Id: If40002b1af6de5fbb34c9518f4c694ed8edf82e7