Merge "[incremental] use vold to mount/unmount IncrementalFileSystem" am: 6bdfb77d8b
am: a0945f468a

Change-Id: I4244844cde78dc46cac88299fa1fd2e2eee9af26