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

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

Change-Id: I5d0be23aa9d3e9e3a674a4c368909b61c843b6dd