Android.mk: allow multiple definitions for JNI_OnLoad conscrypt problem
Merge branch 'master' into jb-devel