Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1
am: 786177f7e6

Change-Id: Ie10ad843cab2b7c12529a5f2ac361b4884890cf8