Merge changes from topic "revert-1433573-vab-libsnapshot-linkage-APIHERUSEB" am: 216ce0985f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1447800

Change-Id: I90e875ca207564bc1b21824858c68a9a8a06afed