Merge "Update doc wrt to android:debuggable and CheckJNI"