Merge changes Iba86a814,If5d702ab

* changes:
  remount: Remove all remaining opaque exit code (RemountStatus enum)
  remount: Don't assert ro.boot.vbmeta.* properties