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

Change-Id: I35baef0d8ec5e0589ab8ffc29973e50d867951ec