Merge "Remove VNDK definition(s)" into main am: b8e5db16b6

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2997181

Change-Id: I833cd02ee90497be822cc638732bcdea2fbf6ea6
Signed-off-by: Automerger Merge Worker <[email protected]>