[automerger skipped] Reland "enforce sdk_version for JNI libs for updatable...
[automerger skipped] Reland "enforce sdk_version for JNI libs for updatable APKs" am: af7f91fc -s ours am: 5bac03f3 -s ours
am skip reason: Change-Id I08543ccee7dfda0559a1fca108ceb5c28f84943f with SHA-1 bbc3fb78 is in history
Change-Id: Ifc0be798ab06ea46c6cf85df52ccb47126621872