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

Change-Id: I0993e879adb49379440fed31bd95213bdb1174eb