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

Change-Id: I11b1637977448ccbfb9ac7b5ac4505728e0ccc42