Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3 am: 9afa4c65d8 am: d4b94d95ab

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919

Change-Id: I11db3a962dbe88092f37604d91f844db31275efa