Merge "Add librs_jni to the generic product packages." into honeycomb