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

Change-Id: I779a671ef4756fb149dc1bd5823eb85f0e846269