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

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

Change-Id: Id4c200a7acfa21c321865d996c795f8cf1bc2bd8