Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58
am: 83b649ee1d

Change-Id: I785c6ec399ee2695af9276b47559f93d7d010a48