Merge "Add a method in vold to unmount app data and obb dir for testing"