Merge "Add checkpointing support for A/B updates" am: ba1752008d am: 0b875d7630

am: 9e9f7cb820

Change-Id: I76999218377271621d14502f9315739dd1b894a5

diff --cc VoldNativeService.cpp
Simple merge

diff --cc VoldNativeService.h
Simple merge

diff --cc binder/android/os/IVold.aidl
index f825a30,27330fe..bf09f7f
--- 1/binder/android/os/IVold.aidl
--- 2/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@@ -99,11 -96,9 +99,12 @@@ interface IVold 
                              int storageFlags);
      void destroyUserStorage(@nullable @utf8InCpp String uuid, int userId, int storageFlags);
  
 +    void mountExternalStorageForApp(in @utf8InCpp String packageName, int appId,
 +                                    in @utf8InCpp String sandboxId, int userId);
 +
      boolean startCheckpoint(int retry);
      boolean needsCheckpoint();
+     boolean needsRollback();
      void abortChanges();
      boolean commitChanges();
      boolean prepareDriveForCheckpoint(@utf8InCpp String mountPoint);