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