Merge "Fix google-explicit-constructor warnings in bootable/recovery."