Merge "Add more mounting options to updater mount function." am: ac1ae4fd2e

Change-Id: Ic13cf40d7bd82222ded2547750fff2aa5cef8eee