Merge "Update support lib's Android.mk for JNI."