Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa am: 6e99b91fd0
am: 9d270b63ad

Change-Id: If65fdd4feae44b70eff25f09d7cae49e2b982996