am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."

* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  Fix missing rs_compatibility_jni_libs.