Merge "Update mount values to be consistent with IVold.aidl"