Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aosp
am: a550e6b412

* commit 'a550e6b4122108fa2db438afcfd7d40386b71b0b':
  recovery: Allow "Mount /system" for system_root_image.