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

Change-Id: I8138e8e33da4a1309e92e6b12cbfee0b4df4af33