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

Change-Id: Ic77c5c75d122545dee270fb53a3fdf558b534755