Merge "[bootable][recovery] fix -Wreorder-init-list"