Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045 am: 9688e3bdeb am: b0ba11a3b5 am: 265328db29

Change-Id: I04b9e1a49541780c51001e9f706f9c1748d931d4