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

Change-Id: I23ffca05ee5c932efac11f304f130fe5a72037dd