Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332

Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2abcaf902b4817ee477ad57074dde7e587b6eb85