Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045 am: 700dc434dc am: 4a5fff16b2 am: 1bd069a580

Change-Id: Ib35dca06a3e1c14647779689a342360613852078