Support new recovery mount mechanisms

Change-Id: I85a22e627ca5d23fd6e05818376a35a6360fd2e4