Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777
am: 1c35b48253

Change-Id: Ic23c7a580b346220485c913e98304c5a3cf05026