Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I884a464727b8f2dbf7554926dd8a0fd9cab71176